merge with xen-unstable.hg

diff --cc tools/libxc/xc_linux_build.c
Simple merge

diff --cc xen/arch/ia64/xen/dom0_ops.c
Simple merge

diff --cc xen/include/public/arch-ia64.h
index 6ab523fab5abb626b2a86f0777a3e4bfaa0c1318,4e3b453382df90d827deda829a3bf14e0921c3a3..b74ca5748fb1f69e7c92a9caef9ac03f743b4f60
--- 1/xen/include/public/arch-ia64.h
--- 2/xen/include/public/arch-ia64.h
+++ b/xen/include/public/arch-ia64.h
@@@ -40,6 -40,21 +40,8 @@@ DEFINE_XEN_GUEST_HANDLE(xen_pfn_t)
  
  #ifndef __ASSEMBLY__
  
 -#define MAX_NR_SECTION  32  /* at most 32 memory holes */
 -struct mm_section {
 -    unsigned long start;  /* start of memory hole */
 -    unsigned long end;    /* end of memory hole */
 -};
 -typedef struct mm_section mm_section_t;
 -
 -struct pmt_entry {
 -    unsigned long mfn : 56;
 -    unsigned long type: 8;
 -};
 -typedef struct pmt_entry pmt_entry_t;
 -
+ typedef unsigned long xen_ulong_t;
+ 
  #define GPFN_MEM          (0UL << 56) /* Guest pfn is normal mem */
  #define GPFN_FRAME_BUFFER (1UL << 56) /* VGA framebuffer */
  #define GPFN_LOW_MMIO     (2UL << 56) /* Low MMIO range */